* server.el (server-create-window-system-frame): Handle Nextstep

specially.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4f14d986bd832fe1d562135b0864bea9def18bb2..2942532a37e51e540397240c819d97384a74ca55 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-08  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * server.el (server-create-window-system-frame): Handle Nextstep
+       specially (Bug#12780).
+
 2012-11-08  Glenn Morris  <rgm@gnu.org>
 
        * mail/emacsbug.el (report-emacs-bug-query-existing-bugs):

diff --git a/lisp/server.el b/lisp/server.el
index 7a356a90378e7d60b01a9b52de899570d86da7d2..ab0dc95a43fb1f24472b4c6f26e85eee31787455 100644 (file)
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -842,6 +842,10 @@ This handles splitting the command if it would be bigger than
     (unless (assq w window-system-initialization-alist)
       (setq w nil))
 
+    ;; Special case for ns.
+    (if (featurep 'ns-win)
+       (setq w 'ns display "ns"))
+
     (cond (w
            ;; Flag frame as client-created, but use a dummy client.
            ;; This will prevent the frame from being deleted when